From 3ba60b06fec34aa213a9c75353d3810a5c1847b1 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 13 Oct 2020 14:58:13 +0200 Subject: [PATCH] gtkpopover: Remove GtkPopoverMenu special case Now that there's ::cascade-popdown, we don't need to treat GtkPopoverMenu especially here. --- gtk/gtkpopover.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index c6fa5851d1..bcaf344f4d 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -596,19 +596,6 @@ gtk_popover_native_check_resize (GtkNative *native) present_popup (popover); } -static void -close_menu (GtkPopover *popover) -{ - while (popover) - { - gtk_popover_popdown (popover); - if (GTK_IS_POPOVER_MENU (popover)) - popover = (GtkPopover *)gtk_popover_menu_get_parent_menu (GTK_POPOVER_MENU (popover)); - else - popover = NULL; - } -} - static gboolean gtk_popover_has_mnemonic_modifier_pressed (GtkPopover *popover) { @@ -720,7 +707,7 @@ gtk_popover_key_pressed (GtkWidget *widget, if (keyval == GDK_KEY_Escape) { - close_menu (popover); + gtk_popover_popdown (popover); return TRUE; } -- 2.30.2